Creating and Modifying a Repository
Back to Home
01. What Makes a Repository a Repository?
02. Initializing a Repository
03. Examining the New Repository
04. Reflect: Initializing a Repository
05. Staging Area
06. Concept Map: init, add, staging area
07. Reflect: Staging Area
08. Writing Good Commit Messages
09. Committing Changes
10. git diff Revisited
11. Commit the Bug Fix
12. Reflect: Commit Size
13. Branches
14. Making a Branch
15. Reflect: When to Use Branches
16. Interview with Mike Wales
17. Branches for Collaboration
18. Reachability
19. Detached HEAD Revisited
20. Reflect: Visualizing with Diagrams
21. Combining Simple Files
22. Combining Simple Files Using Original
23. Merging Coins into Master
24. Merging on the Command Line
25. Reflect: Merging Two Branches
26. Merge Conflicts
27. Conflict Detection
28. Update Easy Mode
29. Resolving Merge Conflicts
30. Committing the Conflict Resolution
31. Concept Map: branch, merge
32. Reflect: Automatic vs. Manual Merging
33. Interview with Jeffrey Middleton
34. Lesson 2 Summary
Back to Home
27. Conflict Detection
Conflict Detection